merge
authorIan Campbell <ian.campbell@xensource.com>
Thu, 5 Apr 2007 14:47:03 +0000 (15:47 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Thu, 5 Apr 2007 14:47:03 +0000 (15:47 +0100)

Trivial merge